Olaf adds 'merge' option in trackfilter.

diff --git a/gpsbabel/README b/gpsbabel/README
index 4e0bfda8233ae5f5f986881e051b257828e6abb8..dd6a205cedabe811e39b50fd8323a6a9c6207ff2 100644 (file)
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -1323,6 +1323,21 @@ DATA FILTERS
                        -x track,pack,split=4h,title="LOG # %c" \ 
                        -o gpx -F out.gpx
 
+       MERGE
+           
+           Merge puts all track points into one single track and
+           sort them by time. Points with identical time stamp 
+           will be dropped !!!
+           
+           If you want to merge tracks from different devices 
+           but from same trip, use this:
+           
+           gpsbabel -t \
+                    -i gpx -f john.gpx \
+                    -i gpx -f doe.gpx \
+                    -x track,merge,title="COMBINED LOG" \
+                    -o gpx -F john_doe.gpx
+
     DISCARD
 
         This filter 'fixes' gps data by discarding points with a hdop

diff --git a/gpsbabel/trackfilter.c b/gpsbabel/trackfilter.c
index 4257dfa400f9d9aceab211b6bcb1a80665d012aa..72175dc4747949155639b7fdad1e19873b7aecbc 100644 (file)
--- a/gpsbabel/trackfilter.c
+++ b/gpsbabel/trackfilter.c
@@ -23,6 +23,8 @@
  /* 
     2005-07-20: implemented interval option from Etienne Tasse
     2005-07-26: implemented range option
+    2005-07-26: implemented move option
+    2005-07-26: implemented merge option
  */
  
 #include <stdio.h>
@@ -60,7 +62,7 @@ arglist_t trackfilter_args[] = {
        {TRACKFILTER_SPLIT_OPTION, &opt_split, 
            "Split track by date or by time interval (see README)", NULL, ARGTYPE_STRING},
        {TRACKFILTER_MERGE_OPTION, &opt_merge, 
-           "Merge multiple tracks for the same way", NULL, ARGTYPE_STRING | ARGTYPE_HIDDEN},
+           "Merge multiple tracks for the same way", NULL, ARGTYPE_STRING},
        {TRACKFILTER_START_OPTION, &opt_start, 
            "Use only track points after this timestamp", NULL, ARGTYPE_INT},
        {TRACKFILTER_STOP_OPTION, &opt_stop, 
@@ -340,24 +342,8 @@ trackfilter_pack(void)
 }
 
 /*******************************************************************************
-* "hidden" option "merge"
+* option "merge"
 *******************************************************************************/
-/* 
-       MERGE
-           
-           Merge puts all track points into one single track and
-           sort them by time. Points with identical time stamp 
-           will be dropped !!!
-           
-           If you want to merge tracks from different devices 
-           but from same trip, use this:
-           
-           gpsbabel -t \
-                    -i gpx -f john.gpx \
-                    -i gpx -f doe.gpx \
-                    -x track,merge,title="COMBINED LOG" \
-                    -o gpx -F john_doe.gpx
-*/         
 
 void
 trackfilter_merge(void)